From 1c440da4d0364d4a200d8880f79a12bb5fae4494 Mon Sep 17 00:00:00 2001 From: "ach61@labyrinth.cl.cam.ac.uk" Date: Wed, 28 Jul 2004 17:27:16 +0000 Subject: [PATCH] bitkeeper revision 1.1108.1.39 (4107e1f4lY3QEYh9L9XnSVpW1HjOSQ) manually merge kmalloc->xmalloc --- xen/arch/x86/pdb-stub.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/pdb-stub.c b/xen/arch/x86/pdb-stub.c index c4ebf74a3d..ea7f137c9a 100644 --- a/xen/arch/x86/pdb-stub.c +++ b/xen/arch/x86/pdb-stub.c @@ -312,7 +312,7 @@ pdb_process_z (int onoff, char *ptr) { if (onoff == 1) { - pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) kmalloc(sizeof(pdb_bwcpoint_t)); + pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) xmalloc(sizeof(pdb_bwcpoint_t)); bwc->address = addr; bwc->length = pdb_x86_bkpt_length; @@ -350,7 +350,7 @@ pdb_process_z (int onoff, char *ptr) { if (onoff == 1) { - pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) kmalloc(sizeof(pdb_bwcpoint_t)); + pdb_bwcpoint_p bwc = (pdb_bwcpoint_p) xmalloc(sizeof(pdb_bwcpoint_t)); bwc->address = addr; bwc->length = length; @@ -734,15 +734,15 @@ pdb_process_command (char *ptr, struct pt_regs *regs, unsigned long cr3, pdb_page_fault = 0; { - u_char *buffer = (u_char *) kmalloc (length); + u_char *buffer = (u_char *) xmalloc (length); if (!buffer) { - printk ("pdb error: kmalloc failure\n"); + printk ("pdb error: xmalloc failure\n"); break; } pdb_read_memory (addr, length, buffer, &pdb_ctx); mem2hex (buffer, pdb_out_buffer, length); - kfree(buffer); + xfree(buffer); } pdb_page_fault_possible = 0; @@ -772,15 +772,15 @@ pdb_process_command (char *ptr, struct pt_regs *regs, unsigned long cr3, pdb_page_fault = 0; { - u_char *buffer = (u_char *) kmalloc (length); + u_char *buffer = (u_char *) xmalloc (length); if (!buffer) { - printk ("pdb error: kmalloc failure\n"); + printk ("pdb error: xmalloc failure\n"); break; } hex2mem (ptr, buffer, length); pdb_write_memory (addr, length, buffer, &pdb_ctx); - kfree(buffer); + xfree(buffer); } pdb_page_fault_possible = 0; -- 2.30.2